Skip to content

Lemojis#49

Merged
SebastiaanZ merged 4 commits into
masterfrom
lemojis
Apr 16, 2020
Merged

Lemojis#49
SebastiaanZ merged 4 commits into
masterfrom
lemojis

Conversation

@lemonsaurus
Copy link
Copy Markdown
Contributor

@lemonsaurus lemonsaurus commented Apr 16, 2020

It's time to get our wonderful emojis merged to branding.

Before we do that, we need to sort out some legal stuff on this branch. Here's what needs to be done:

  • We have remixed Twemoji's to make these, so we need to include attribution and explain which changes have been made. These are licensed under CC BY 4.0. Let's add these to the README.
  • Another provision in this license is that we cannot impose additional restrictions, which sadly, our current license does (no commercial use). The solution there is that the lemojis can just be licensed under CC BY 4.0, and the rest of the repo can use our current license. We need to add the license itself to the lemoji folder, and then add information about this into our README, probably in the same place where we're putting attribution.

After this is done, we should be good to merge.

image

manusaurio and others added 4 commits February 21, 2020 02:53
`lemon_fingerguns+swag.svg` is the source for both `lemon_fingerguns.png` and `lemon_fingerguns_shades.png`
We need to attribute Twemoji since we're remixing and adapting their
emojis to create our Lemojis. These also need to be licensed under a CC BY 4.0
license, which isn't compatible with the one for the rest of our stuff.

This commit takes care of all that, and cleans up the README while at it.
@lemonsaurus lemonsaurus marked this pull request as ready for review April 16, 2020 20:15
Copy link
Copy Markdown
Contributor

@SebastiaanZ SebastiaanZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lookin' good.

@SebastiaanZ SebastiaanZ merged commit d39a6b8 into master Apr 16, 2020
@MarkKoz MarkKoz deleted the lemojis branch April 16, 2020 22:11
lemonsaurus pushed a commit that referenced this pull request Apr 17, 2020
lemonsaurus pushed a commit that referenced this pull request Apr 17, 2020
Lemojis

Former-commit-id: d39a6b8
Former-commit-id: bbdec3b
lemonsaurus pushed a commit that referenced this pull request Apr 17, 2020
Lemojis

Former-commit-id: d39a6b8
Former-commit-id: bbdec3b
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants